Autogenerated HTML docs for v1.6.0.2-287-g3791f
diff --git a/git-config.html b/git-config.html index a64b28d..9c80584 100644 --- a/git-config.html +++ b/git-config.html
@@ -1576,6 +1576,59 @@ </p> </dd> <dt> +diff.mnemonicprefix +</dt> +<dd> +<p> + If set, <em>git-diff</em> uses a prefix pair that is different from the + standard "a/" and "b/" depending on what is being compared. When + this configuration is in effect, reverse diff output also swaps + the order of the prefixes: +</p> +<div class="vlist"><dl> +<dt> +<em>git-diff</em> +</dt> +<dd> +<p> + compares the (i)ndex and the (w)ork tree; +</p> +</dd> +<dt> +<em>git-diff HEAD</em> +</dt> +<dd> +<p> + compares a (c)ommit and the (w)ork tree; +</p> +</dd> +<dt> +<em>git diff --cached</em> +</dt> +<dd> +<p> + compares a (c)ommit and the (i)ndex; +</p> +</dd> +<dt> +<em>git-diff HEAD:file1 file2</em> +</dt> +<dd> +<p> + compares an (o)bject and a (w)ork tree entity; +</p> +</dd> +<dt> +<em>git diff --no-index a b</em> +</dt> +<dd> +<p> + compares two non-git things (1) and (2). +</p> +</dd> +</dl></div> +</dd> +<dt> diff.renameLimit </dt> <dd> @@ -2744,7 +2797,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-09-13 06:06:56 UTC +Last updated 2008-09-19 06:26:30 UTC </div> </div> </body>
